From fc51af8a3b313c1f028eff0463fa41b424d205c5 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 29 Jan 2020 15:25:26 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 466145 -> 466873 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 5b837ec5443..e447757bcb8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -863,7 +863,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 42c218e1c00c07120b5d184eeb687e2d37b52c52..864862ccdace2341bd7101696a29758d1bf6fd26 100644
GIT binary patch
delta 568
zcmaF3Q)cIWnT9Ql{mOh?3P2E@l~|UTlAjzqS+QGma_?0h-SW(m3|*M04p<RbVQ@ie
za%Ng)YOz8|Mydi-!SpRkjOr|2Kr^O4P-0Z(gbFL9OrEe)jKkl>TLC5~Io(B>QFD5U
z0i)tHQAQzlm;t#;jB4^=TViz}wnc+n5D%5NtxPSBZEsL!1Y)M`4a&@^Hv|-P6BU$H
zQu7j%a#G{-Q?jSW?qHFh{`WVt@AL#e7Jj(VA5~anrhENiHlBWQ8;i*FfJe+6)2IGn
zmY803hnaW!wm;0O(+zmpSf|VWV`iWJ_z$!A^jG_tWv27}WmcK)Eyl(_xqy#lx&a$I
z=X8Zb%q-J={{mGsd|?)wUi6pQaQYrz7IBa)$K+a0)yWRL9McoZ7&)fj|I2JU{lih9
zRWkpW6{kyZ098$R4b%?ga!e2S$E-R1N;r$e<aK-;)Azq+W}DvskJ)_sxp&MQ!d{MH
zjxPSrp26;3K+0AL==JG_hu9>iZ_s05HQ@xsLTO%cYKa0=As1&_COG7PRBBFfDwvI;
xV*0~>%o;kV<|--JDu9euvIa$D9v3I74*qwnV(kL|nSq!Eh*`G_{Aar;3jp!Ly+Qy0

delta 219
zcmdnFU*_RXnT9Ql{mShIs*FI)wB10JIqb&tdq0`Er{`)j@lOA6nvHdO^kZht=~Dlh
zg{E&81B#jaV>X_C<rlNW^yYs+Lh1=nV&gw%ndt&AnOUY^{l_dlJ?koq$aIC%EL_tY
z9s|XIdc~&ys$k-qK4CK(@AQEG%;M80C^7R*ul>(#IQ{HzX3weoECyixQ@vSar^~Rj
zb5Ct%F`Rzv8>7I~D=fBrUXEdoF8<D*!R}r_YP#c5HmT{|j4aaA&-`STZU4u}0>rF9
M%(nd>Bl~Vy0N_bcMF0Q*

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0b63489f05..2d9d5ee6dcb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 410f8cf8ef1..363a8a41dea 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index be03d40ff58..bed51e1c7a6 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2